Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 24, 2025

See odoo/odoo#104836

task-2963840

Forward-Port-Of: #14984

@robodoo
Copy link
Collaborator

robodoo commented Oct 24, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 24, 2025

@qsm-odoo while this was properly forward-ported, at least one co-dependent PR (odoo/odoo#233118, odoo/enterprise#98108, odoo/design-themes#1173) did not succeed. You will need to fix it before this can be merged.

Both this PR and the others will need to be approved via @robodoo r+ as they are all considered “in conflict”.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

Also removes outdated things in the `<template>` tag documentation and
reviews it a bit.

See odoo/odoo#104836

task-2963840

X-original-commit: 4a6611b
@qsm-odoo qsm-odoo force-pushed the 18.0-15.0-assets_ignore_active-bso-353494-fw branch from 781f53f to 0f7b43f Compare October 27, 2025 16:08
@qsm-odoo qsm-odoo requested a review from AntoineVDV October 27, 2025 16:10
@qsm-odoo
Copy link

@AntoineVDV Would you approve/delegate here? 🙏 No conflict, rebuilt in local, seems good 👍

@C3POdoo C3POdoo requested review from a team, HydrionBurst and kmagusiak and removed request for a team October 27, 2025 16:17
@Feyensv
Copy link
Collaborator

Feyensv commented Oct 27, 2025

Don't you have r+ rights in your forward-ports automatically ? 🤔

robodoo delegate+

Copy link

@qsm-odoo qsm-odoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delegate probably useless, but I am guessing I still need the approval or does this say I can approve myself too?
image

Let's see:

@robodoo r+

@Feyensv
Copy link
Collaborator

Feyensv commented Oct 27, 2025

Indeed, delegate+ is useless since it'd give rights to the fw-port bot 🤦‍♂️.
But the original author has review rights on fw-port PRs AFAIK

@AntoineVDV
Copy link
Collaborator

@qsm-odoo This is the generic merge requirement set on this GitHub project (similar to odoo/odoo) so that people don't click that big green button at the bottom of the page, but mergebot doesn't care about it.

@robodoo
Copy link
Collaborator

robodoo commented Oct 27, 2025

@qsm-odoo linked pull request(s) odoo/design-themes#1173, odoo/enterprise#98108, odoo/odoo#233118 not ready. Linked PRs are not staged until all of them are ready.

@robodoo
Copy link
Collaborator

robodoo commented Oct 27, 2025

@qsm-odoo linked pull request(s) odoo/odoo#233118 not ready. Linked PRs are not staged until all of them are ready.

robodoo pushed a commit to odoo/odoo that referenced this pull request Oct 28, 2025
*: test_website, base, web_editor, website, website_blog, website_event,
   website_mail_group, website_mass_mailing, website_payment,
   website_sale, test_assetsbundle

Before this commit when a module was updated all ir.asset records were
reset to their defined `active` state, if defined.
This causes assets related to old snippet versions to be made inactive
even if those old snippet versions are used inside existing pages.

It used to work when the activation of assets was made through view
inheritance because when views are defined through a `<template>` tag,
the `active` attribute is in fact ignored during updates since [1],
except for new records since [2].

This commit introduces an `<asset>` tag in the XML import format.
It is an alias of `<record ... model="ir.asset">` with the additional
feature that it avoids taking the `active` field into account during
updates for existing `ir_asset` records, just like `<template>` if the
`active` field is mentioned as attribute of the tag.
We then rely on the `website_disable_unused_snippets_assets` cron to
properly disable any unused asset at a later stage (note that the bug
being fixed here was mitigated by the fact that cron also re-enabled
assets which were disabled by mistake... but that might happen only a
few days later).

Another approach was to overload `_load_records_write` in `base`'s
`ir_asset.py` to avoid taking the `active` field into account when
updating records:
```py
    def _load_records_write(self, values):
        values.pop('active', None)
        super()._load_records_write(values)
```
But this is not as stable because it changes the way `ir.asset` records
are imported when the `<record>` tag is used. In the end we chose to be
consistent and do exactly the same as `<template>`, as this also allows
more and should be entirely stable.

[1]: 2d296cb#diff-175c28787c272a219b9275f79262a48af9aa029e718f45077fd609737559e84eR803-R804
[2]: f1c70d4#diff-175c28787c272a219b9275f79262a48af9aa029e718f45077fd609737559e84eR801-R804

task-2963840

closes #233118

X-original-commit: 58c75d0
Related: odoo/enterprise#98108
Related: odoo/documentation#15007
Related: odoo/design-themes#1173
Signed-off-by: Quentin Smetz (qsm) <[email protected]>
Co-authored-by: qsm-odoo <[email protected]>
robodoo pushed a commit to odoo/design-themes that referenced this pull request Oct 28, 2025
*: theme_anelusia, theme_artists, theme_avantgarde,
   theme_aviato, theme_beauty, theme_bewise, theme_bistro,
   theme_bookstore, theme_buzzy, theme_clean, theme_cobalt,
   theme_enark, theme_graphene, theme_kea, theme_kiddo,
   theme_loftspace, theme_monglia, theme_nano, theme_notes,
   theme_odoo_experts, theme_orchid, theme_paptic,
   theme_real_estate, theme_test_custo, theme_treehouse,
   theme_vehicle, theme_yes, theme_zap

See community commit for details.

task-2963840

closes #1173

X-original-commit: e46be95
Related: odoo/odoo#233118
Related: odoo/enterprise#98108
Related: odoo/documentation#15007
Signed-off-by: Quentin Smetz (qsm) <[email protected]>
Co-authored-by: qsm-odoo <[email protected]>
robodoo pushed a commit that referenced this pull request Oct 28, 2025
Also removes outdated things in the `<template>` tag documentation and
reviews it a bit.

See odoo/odoo#104836

task-2963840

closes #15007

X-original-commit: 4a6611b
Related: odoo/odoo#233118
Related: odoo/enterprise#98108
Related: odoo/design-themes#1173
Signed-off-by: Quentin Smetz (qsm) <[email protected]>
@robodoo robodoo closed this Oct 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants